Fix extract_correlated_key to handle Arel::Nodes::And with multiple children
#1584
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes a bug in
extract_correlated_keythat causedNoMethodError: undefined method 'eq' for nilwhen building queries with polymorphic associations and complex join conditions.Problem
The
extract_correlated_keymethod only checked theleftandrightproperties ofArel::Nodes::Andnodes:However,
Arel::Nodes::Andcan have more than 2 children stored in thechildrenarray. When Rails builds complex queries with polymorphic associations and default scopes, it createsAndnodes with multiple conditions. If the matching equality condition containing the primary key correlation was in the third or later position,extract_correlated_keywould returnnil, causing the error when trying to callcorrelated_key.eq(primary_key).Reproduction
This issue typically occurred with queries like:
Solution
Updated the method to iterate through all children of
Andnodes instead of only checking the first two:Changes
extract_correlated_keymethod inlib/ransack/adapters/active_record/context.rb.gitignoreto excludevendor/bundleTesting
This is a minimal, surgical fix that maintains full backward compatibility while resolving the issue for users encountering this error with complex query scenarios.
Additional instructions:
Fixes #1571
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.